From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Sun, 22 Oct 2006 02:47:58 +0000 (+0000)
Subject: (bug 7661) Fix regression in XHTML validity for Cologne Blue (duplicate id's for... 
X-Git-Tag: 1.31.0-rc.0~55404
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=b5e6367c610dbc5da7ceacd5e32b94021ce938f3;p=lhc%2Fweb%2Fwiklou.git

(bug 7661) Fix regression in XHTML validity for Cologne Blue (duplicate id's for search form).
---

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index f304e37eb2..6613ff12ad 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -17,6 +17,9 @@ if( !defined( 'MEDIAWIKI' ) )
  */
 class SkinCologneBlue extends Skin {
 
+	private $searchboxes = '';
+	// How many search boxes have we made?  Avoid duplicate id's.
+
 	function getStylesheet() {
 		return 'common/cologneblue.css';
 	}
@@ -301,12 +304,15 @@ class SkinCologneBlue extends Skin {
 
 		$search = $wgRequest->getText( 'search' );
 		$action = $this->escapeSearchLink();
-		$s = "<form id=\"searchform\" method=\"get\" class=\"inline\" action=\"$action\">";
+		$s = "<form id=\"searchform{$this->searchboxes}\" method=\"get\" class=\"inline\" action=\"$action\">";
 		if ( "" != $label ) { $s .= "{$label}: "; }
 
-		$s .= "<input type='text' id=\"searchInput\" name=\"search\" size=\"14\" value=\""
+		$s .= "<input type='text' id=\"searchInput{$this->searchboxes}\" name=\"search\" size=\"14\" value=\""
 		  . htmlspecialchars(substr($search,0,256)) . "\" />"
-		  . "<br /><input type='submit' id=\"searchGoButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" /> <input type='submit' id=\"mw-searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>";
+		  . "<br /><input type='submit' id=\"searchGoButton{$this->searchboxes}\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( "searcharticle" ) ) . "\" /> <input type='submit' id=\"mw-searchButton{$this->searchboxes}\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( "search" ) ) . "\" /></form>";
+
+		// Ensure unique id's for search boxes made after the first
+		$this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1;
 
 		return $s;
 	}